feat(cli, webui): add follow-up suggestions feature by wenshao · Pull Request #2525 · QwenLM/qwen-code

wenshao · 2026-03-20T04:20:10Z

Summary

Implement context-aware follow-up suggestions that appear after task completion, suggesting relevant next actions like "commit this", "run tests", etc.

This feature is similar to Claude Code's NES (Next-Step Suggestions) functionality.

Changes

Core Module (`packages/core`)

Add followup/ module with:
- types.ts - TypeScript interfaces for suggestions
- suggestionGenerator.ts - Main service orchestrating providers
- ruleBasedProvider.ts - Pattern-based suggestion rules
Export follow-up types and functions from core index
8 default suggestion rules covering common workflows

CLI (`packages/cli`)

Add useFollowupSuggestionsCLI hook for Ink/React state management
Integrate suggestion generation in AppContainer when streaming completes
Add keyboard handlers:
- Tab - Accept the current suggestion
- Right/Left arrows - Cycle through multiple suggestions
Display suggestions as ghost text in the input prompt

Web UI (`packages/webui`)

Add useFollowupSuggestions hook for React
Update InputForm to display suggestions as styled placeholder
Add CSS styling for blue italic suggestion appearance with counter
Add keyboard handlers matching CLI behavior

Usage

After a task completes with tool calls, suggestions automatically appear
Press Tab to accept the current suggestion (fills input)
Press Right/Left arrows to cycle through multiple suggestions
Start typing or pasting to dismiss the suggestion

Example Suggestions

Context	Suggestions
After editing files	"commit this", "review changes", "undo"
After creating files	"add tests", "document this", "review file"
After fixing bugs	"verify fix", "add test case", "check for regressions"
After refactoring	"run tests", "commit changes"

Known Limitations

Shell command rules (tests, git, npm install) don't work yet because history doesn't store tool arguments
VSCode extension integration is pending
Web UI needs parent app integration to trigger suggestion generation

Test plan

Edit a file → verify "commit this" appears
Run tests → verify "fix failing tests" appears (when shell args are available)
Create new file → verify "add tests" appears
Multiple suggestions → verify cycling works with arrow keys
Press Tab → verify suggestion fills input
Start typing → verify suggestion dismisses

🤖 Generated with Claude Code

github-actions · 2026-03-20T04:21:16Z

📋 Review Summary

This PR implements a context-aware follow-up suggestions feature similar to Claude Code's NES functionality, suggesting relevant next actions after task completion. The implementation spans core, CLI, and webui packages with a well-structured architecture. Overall, the code is clean and follows project conventions, but there are several issues that should be addressed before merging.

🔍 General Feedback

Positive: Clean separation of concerns with a provider-based architecture for suggestions. The rule-based system is extensible and well-documented.
Positive: Consistent implementation across CLI (Ink/React) and Web UI with similar hook patterns.
Positive: Good use of TypeScript types and interfaces throughout.
Concern: No test files included for this feature - the PR description mentions a test plan but no automated tests are present.
Concern: The diff shows dependencies being added to package.json (@agentclientprotocol/sdk, @qwen-code/web-templates) that appear unrelated to this feature.
Pattern: Heavy use of setTimeout for debouncing without clear cleanup in all code paths.

🎯 Specific Feedback

🔴 Critical

File: packages/core/src/followup/ruleBasedProvider.ts:52-62 - The Shell tool rule attempts to access call.input['command'] but the history doesn't store tool arguments (as noted in the PR description). This will cause all shell-based rules to never match. Either remove these rules or implement proper argument tracking.
File: packages/cli/src/ui/AppContainer.tsx:880-885 - The modifiedFiles extraction uses placeholder paths '(file)' instead of actual file paths. This defeats the purpose of file-based rules and could cause issues if file-specific logic is added later. The comment acknowledges this limitation but the code should either properly extract paths or not pretend to.
File: package.json - Two dependencies are added (@agentclientprotocol/sdk, @qwen-code/web-templates) that don't appear to be used in this PR. These should be removed or justified.

🟡 High

File: packages/core/src/followup/ruleBasedProvider.ts:74-86 - The "fix/bug" rule uses matchMessage: true but the matchesRule method (line 178-200) checks context.lastMessage which is limited to 1000 characters in AppContainer. Important keywords might be truncated.
File: packages/cli/src/ui/hooks/useFollowupSuggestions.tsx:104-112 - The accept function has a race condition protection mechanism using refs, but the 100ms delay is arbitrary and could still allow rapid-fire accepts under certain conditions. Consider using a more robust state machine approach.
File: packages/cli/src/ui/components/InputPrompt.tsx:1136-1145 - The placeholder rendering logic with follow-up suggestions uses multiple fallback chains (followup.state.suggestion || placeholder || '') which is hard to read and maintain. Extract to a computed variable.
File: packages/webui/src/components/layout/InputForm.tsx:244-264 - The keyboard handlers for cycling suggestions check !inputEl.textContent but this may not work reliably with contentEditable elements that contain formatting or special characters.

🟢 Medium

File: packages/core/src/followup/types.ts:48-53 - The ToolCallInfo interface defines status as 'success' | 'error' | 'cancelled', but in AppContainer.tsx:862-867 the mapping from ToolCallStatus enum is incomplete - it doesn't handle all enum values. Add a default case or use exhaustive checking.
File: packages/core/src/followup/ruleBasedProvider.ts:156-163 - The convertToFollowupSuggestions method assigns priority as 100 - index * 10, which could result in negative priorities for suggestions beyond index 10. Consider using Math.max(0, ...) or a different formula.
File: packages/cli/src/ui/AppContainer.tsx:850 - The useEffect for generating suggestions has a complex dependency array but is missing getGenerator and extractSuggestionContext which are imported functions that could theoretically change.
File: packages/webui/src/hooks/useFollowupSuggestions.ts:12 - The comment states "For browser environments, the parent component should handle suggestion generation" but this isn't documented elsewhere. Add JSDoc to clarify the expected usage pattern.
File: packages/core/src/followup/suggestionGenerator.ts:67-88 - The extractSuggestionContext function has optional parameters but doesn't validate that required fields are present. Add runtime validation or make required fields non-optional.

🔵 Low

File: packages/core/src/followup/ruleBasedProvider.ts - The DEFAULT_SUGGESTION_RULES array has 8 rules but no documentation explaining what each rule is for. Add comments before each rule block.
File: packages/cli/src/ui/hooks/useFollowupSuggestions.tsx:68-78 - The example in JSDoc shows importing from './hooks/useFollowupSuggestions' but should use the package import pattern for consistency with other examples in the codebase.
File: packages/webui/src/styles/components.css:445-474 - CSS uses hardcoded color #3b82f6 as fallback instead of consistently using the CSS variable. Consider removing the hardcoded fallback or documenting when it applies.
File: packages/core/src/index.ts:253 - The follow-up suggestions export section uses a separator comment like other sections, but the section name "Follow-up Suggestions" doesn't match the naming convention (should be "Followup" without hyphen to match the module name).
File: packages/cli/src/ui/components/InputPrompt.tsx:20 - Import statement has FollowupSuggestion and Config on the same line but Config is already imported elsewhere in the file (line 80). Consolidate imports.

✅ Highlights

Well-designed provider pattern allows for easy extension with custom suggestion providers (ML-based, user-defined rules, etc.)
Excellent keyboard interaction design with Tab acceptance and arrow key cycling that matches user expectations
Good use of React hooks patterns with proper cleanup of timeouts in useEffect
The rule-based system with priority ordering is elegant and allows for fine-grained control
Comprehensive type definitions in types.ts provide clear contracts for the feature
CSS styling for suggestions (blue italic with counter) provides clear visual distinction from normal placeholders

Implement context-aware follow-up suggestions that appear after task completion, suggesting relevant next actions like "commit this", "run tests", etc. - Add `followup/` module with types, generator, and rule-based provider - Export follow-up types and functions from core index - 8 default suggestion rules covering common workflows - Add `useFollowupSuggestionsCLI` hook for Ink/React - Integrate suggestion generation in AppContainer when streaming completes - Add Tab key to accept, arrow keys to cycle through suggestions - Display suggestions as ghost text in input prompt - Add `useFollowupSuggestions` hook for React - Update InputForm to display suggestions as placeholder - Add CSS styling for suggestion appearance with counter - Add keyboard handlers (Tab, arrow keys) - After streaming completes with tool calls, suggestions appear - Tab accepts the current suggestion - Left/Right arrows cycle through multiple suggestions - Typing or pasting dismisses the suggestion - Shell command rules (tests, git, npm install) don't work yet due to history not storing tool arguments - VSCode extension integration pending - Web UI needs parent app integration for suggestion generation Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Rebased on upstream main (5d02260) - Fixed JSX structure in InputPrompt.tsx - Changed `return;` to `return true;` in follow-up handlers - Added @agentclientprotocol/sdk to core package dependencies - Restored correct BaseTextInput usage (self-closing, no children) - Follow-up suggestions now shown via placeholder prop only Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The types are imported in fileSystemService.ts but the package should not be a runtime dependency of core. It's provided by the CLI package which depends on core. This was causing package-lock.json sync issues on Node.js 24.x CI. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

wenshao · 2026-03-20T08:17:35Z

CI Test Failures - Pre-existing Issue

The test failures are caused by a pre-existing flaky test that also fails on upstream/main:

Test:

Error:

Verification: I ran the same test on upstream/main (commit fbf5ed5) and it fails with the identical error. This test failure is NOT caused by the follow-up suggestions feature changes.

Files changed by this PR:

packages/cli/src/ui/AppContainer.tsx
packages/cli/src/ui/components/InputPrompt.tsx
packages/cli/src/ui/hooks/useFollowupSuggestions.tsx
packages/core/src/followup/*.ts
packages/webui/src/components/layout/InputForm.tsx
packages/webui/src/hooks/useFollowupSuggestions.ts

None of these files touch the ACP connection code or tests.

Suggested actions:

Fix or skip the flaky acpConnection.test.ts test in a separate PR
Once that's merged, re-run CI on this PR to verify all tests pass

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

- Export followupState.ts from core index (was dead code) - Refactor CLI and WebUI hooks to use shared followupReducers (eliminate duplication) - Move side effects out of setState updaters via queueMicrotask - Fix AppContainer useEffect dependency on unstable historyManager.history reference - Reorder matchesRule to check pattern before condition (cheaper first) - Make RuleBasedProvider collect from all matching rules with dedup and limit - Add missing resetGenerator export for testing - Add explicit implements SuggestionProvider to RuleBasedProvider - Fix unstable followup object in useEffect dependency arrays - Merge duplicate imports to fix eslint import/no-duplicates warnings - Standardize copyright year to 2025 - Add test files for followupState, ruleBasedProvider, suggestionGenerator Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…ions

Copilot

Pull request overview

Adds a new “follow-up suggestions” capability across core, CLI, and Web UI so that after a tool-driven turn completes the user sees context-aware next-step prompts (accept via Tab, cycle via arrows).

Changes:

Core: Introduces followup/ module (types, state reducers, generator, rule-based provider) and exports it from @qwen-code/qwen-code-core, with unit tests.
CLI: Adds an Ink hook + keybindings and wires suggestion generation on stream completion; threads suggestions through UI state into the prompt placeholder.
Web UI: Adds a React hook, InputForm integration (ghost placeholder + key handling), and CSS styling/counter.

Reviewed changes

Copilot reviewed 19 out of 20 changed files in this pull request and generated 11 comments.

Show a summary per file

File	Description
packages/webui/src/styles/components.css	Styles ghost follow-up placeholder + hover + counter UI.
packages/webui/src/index.ts	Exports the new Web UI hook + follow-up types (and re-exports a core type).
packages/webui/src/hooks/useFollowupSuggestions.ts	Adds Web UI hook managing follow-up suggestion state and accept/cycle/dismiss behaviors.
packages/webui/src/components/layout/InputForm.tsx	Adds follow-up props, ghost placeholder display, Tab/Arrow handling, and dismiss-on-type behavior.
packages/vscode-ide-companion/src/services/acpConnection.test.ts	Refactors a test to mock connection behavior via `ensureConnection`.
packages/core/src/index.ts	Re-exports follow-up module from core public index.
packages/core/src/followup/types.ts	Defines follow-up suggestion and context/provider interfaces.
packages/core/src/followup/suggestionGenerator.ts	Implements generator orchestration + singleton helpers + context extraction helper.
packages/core/src/followup/suggestionGenerator.test.ts	Adds unit tests for generator behavior and context extraction.
packages/core/src/followup/ruleBasedProvider.ts	Implements default rule set + matching/deduping/priority logic.
packages/core/src/followup/ruleBasedProvider.test.ts	Adds unit tests for rule matching, merging, deduping, and limits.
packages/core/src/followup/index.ts	Barrel export for follow-up module.
packages/core/src/followup/followupState.ts	Adds framework-agnostic follow-up state + reducers (shared by CLI/Web).
packages/core/src/followup/followupState.test.ts	Adds unit tests for state reducers.
packages/cli/src/ui/hooks/useFollowupSuggestions.tsx	Adds CLI hook to manage follow-up suggestion state and interactions.
packages/cli/src/ui/contexts/UIStateContext.tsx	Extends UI state to carry follow-up suggestions.
packages/cli/src/ui/components/InputPrompt.tsx	Displays suggestions as placeholder + Tab/Arrow key behaviors + dismiss-on-input.
packages/cli/src/ui/components/Composer.tsx	Passes follow-up suggestions from UI state into `InputPrompt`.
packages/cli/src/ui/AppContainer.tsx	Generates suggestions on stream completion using history tool groups and stores them in UI state.
package-lock.json	Lockfile updates related to local test-utils dependency placement/metadata.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

- Fix acceptingRef race: set lock synchronously before queueMicrotask - Derive hasError/wasCancelled from actual tool call statuses - Incorporate rule priority into suggestion priority calculation - Clear suggestions immediately when setSuggestions([]) is called - Add !completion.showSuggestions guard to Tab handler - Fix onAcceptFollowup type from (string) => void to () => void - Fix ToolCallInfo.name doc examples to match display names - Scope CSS counter ::after to data-has-suggestion + empty conditions - Reset regex lastIndex before test() for g/y flag safety - Stabilize hook return with useMemo + onAcceptRef pattern - Add @qwen-code/qwen-code-core as webui external + peerDependency Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

When opening the model selection dialog via /model --fast, the currently configured fastModel is pre-selected instead of the main model. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

/model <Tab> now shows --fast as a completion option with description. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 56 out of 57 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Adds enableCacheSharing, enableSpeculation, and fastModel to the generated JSON schema so CI validation passes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 56 out of 57 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Add "Fast Model" to expected labels in systemInfoFields and bugCommand tests to match the new field added to /about and bug report output. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 56 out of 57 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 58 out of 59 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

- modelCommand: use getPersistScopeForModelSelection for fastModel, return meaningful info message instead of empty content - ModelDialog: handle $runtime|authType|modelId format in fast-model mode - forkedQuery: return structuredClone from getCacheSafeParams - client: fix stale comment about history truncation order - speculation: detect abort in .then() handler, set 'aborted' status and cleanup overlay to prevent leaks - docs: update test count table Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 58 out of 59 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

- New feature page: followup-suggestions.md covering usage, keybindings, fast model configuration, settings, and quality filters - commands.md: add /model --fast command reference - settings.md: add enableFollowupSuggestions, enableCacheSharing, enableSpeculation, and fastModel settings documentation - _meta.ts: register new page in navigation Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 62 out of 63 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

- followup-suggestions.md: add 300ms delay, WebUI support, plan mode guard, non-interactive guard, slash commands as single-word, meta/error filters, character limit - settings.md: move fastModel next to model section, add /model --fast cross-reference and link to feature page - overview.md: add followup suggestions to feature list - i18n: add missing translations for 'Set fast model for background tasks' and 'Fast model updated.' in all 6 locales Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 63 out of 64 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

- modelCommand: remove duplicate info message (keep addItem only) - followup-suggestions.md: clarify WebUI requires host app wiring - speculation-design.md: fix abort telemetry description - i18n: add missing translations for fast model strings Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 63 out of 64 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Use return message instead of addItem + empty return to avoid blank INFO line in history. Also handle missing settings service. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 63 out of 64 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

The /model --fast command now returns the model name directly instead of using this string. Remove dead translations. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 63 out of 64 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Forked queries inherit the main conversation's generationConfig which may have thinkingConfig enabled. This wastes tokens and adds latency for background tasks that don't need reasoning. Explicitly set thinkingConfig.includeThoughts=false in both paths: - createForkedChat (covers forked query + speculation) - generateViaBaseLlm (non-cache-sharing fallback) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

- User docs: note that thinking is auto-disabled for suggestions/speculation - Design docs: detail thinkingConfig override in both forked query and BaseLlm paths, explain why cache hits are unaffected Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 63 out of 64 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

wenshao requested review from DennisYu07, DragonnZhang, LaZzyMan, Mingholy, gwinthis, pomelo-nwu and tanzhenxin as code owners March 20, 2026 04:20

wenshao mentioned this pull request Mar 20, 2026

Feature Request: Integrate Follow-up Suggestions into Web UI #2523

Closed

wenshao force-pushed the feat/followup-suggestions branch from aa3e3fc to 0300da2 Compare March 20, 2026 04:24

wenshao closed this Mar 20, 2026

wenshao reopened this Mar 20, 2026

wenshao force-pushed the feat/followup-suggestions branch from 0300da2 to 53cc80d Compare March 20, 2026 04:26

wenshao and others added 5 commits March 20, 2026 15:28

fix: restore alphabetical order of dependencies in core/package.json

bec72e0

fix: restore package-lock.json from upstream to fix Node 24.x CI

b1e29a1

wenshao force-pushed the feat/followup-suggestions branch from 0762082 to b1e29a1 Compare March 20, 2026 07:29

wenshao and others added 6 commits March 21, 2026 00:52

fix: resolve acpConnection test failure and ESLint warning

004baae

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

Merge upstream/main into feat/followup-suggestions

45a5141

style: apply prettier formatting after merge

bc6e62f

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

Merge main into feat/followup-suggestions

113ae98

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

Merge remote-tracking branch 'origin/main' into feat/followup-suggest…

46e368e

…ions

wenshao requested a review from Copilot March 25, 2026 01:19

Copilot started reviewing on behalf of wenshao March 25, 2026 01:19 View session

Copilot AI reviewed Mar 25, 2026

View reviewed changes

wenshao and others added 2 commits April 2, 2026 15:50

fix(cli): /model --fast defaults to current fast model in dialog

2348093

When opening the model selection dialog via /model --fast, the currently configured fastModel is pre-selected instead of the main model. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

feat(cli): add --fast tab completion for /model command

5f01a1d

/model <Tab> now shows --fast as a completion option with description. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>